105. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:08:46 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

105.1 Files compared

#	Location	File	Last Modified
1	/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/etc/import	demo05_old.xml	2019-12-13 09:05:10 +0000
2			2021-05-13 09:08:46 +0000

105.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	0	0
Removed	1	762

105.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail
Active line-pairing rules

105.4 Active regular expressions

No regular expressions were active.

105.5 Comparison detail

1		<root>
2		<config>
3
4		<web>
5
6		<default>
7
8		<cms_home_page>
9		porto_home_5_old
10		</cms_home_page>
11
12		<cms_no_route>
13		no-route-2
14		</cms_no_route>
15
16		</default>
17
18		</web>
19
20		<cms>
21
22		<wysiwyg>
23
24		<enabled>
25		hidden
26		</enabled>
27
28		</wysiwyg>
29
30		</cms>
31		»
32		<design>
33		» »
34		<header>
35		» » »
36		<logo_width>
37		</logo_width>
38		» » »
39		<logo_height>
40		</logo_height>
41		» » »
42		<logo_src>
43		</logo_src>
44		» »
45		</header>
46		»
47		</design>
48		»
49		<dev>
50		» »
51		<js>
52		» » »
53		<merge_files>
54		1
55		</merge_files>
56		» »
57		</js>
58		»
59		</dev>
60
61		<porto_settings>
62
63		<general>
64
65		<boxed>
66		wide
67		</boxed>
68
69		<layout>
70		1140
71		</layout>
72
73		<disable_border_radius>
74		0
75		</disable_border_radius>
76
77		<show_site_notice>
78		0
79		</show_site_notice>
80
81		</general>
82
83		<header>
84
85		<header_type>
86		1
87		</header_type>
88
89		<static_block>
90		porto_custom_block_for_header
91		</static_block>
92
93		<sticky_header_logo>
94		</sticky_header_logo>
95
96		</header>
97
98		<footer>
99
100		<footer_top>
101		0
102		</footer_top>
103
104		<footer_top_block>
105		custom
106		</footer_top_block>
107
108		<footer_top_custom>
109		porto_footer_top_custom_block
110		</footer_top_custom>
111
112		<footer_middle>
113		1
114		</footer_middle>
115
116		<footer_ribbon>
117		1
118		</footer_ribbon>
119
120		<footer_ribbon_text>
121		Ribbon Text
122		</footer_ribbon_text>
123
124		<footer_middle_column_1>
125		custom
126		</footer_middle_column_1>
127
128		<footer_middle_column_1_custom>
129		porto_footer_links
130		</footer_middle_column_1_custom>
131
132		<footer_middle_column_1_size>
133		3
134		</footer_middle_column_1_size>
135
136		<footer_middle_column_2>
137		custom
138		</footer_middle_column_2>
139
140		<footer_middle_column_2_custom>
141		porto_footer_contact_information
142		</footer_middle_column_2_custom>
143
144		<footer_middle_column_2_size>
145		3
146		</footer_middle_column_2_size>
147
148		<footer_middle_column_3>
149		custom
150		</footer_middle_column_3>
151
152		<footer_middle_column_3_custom>
153		porto_footer_features
154		</footer_middle_column_3_custom>
155
156		<footer_middle_column_3_size>
157		3
158		</footer_middle_column_3_size>
159
160		<footer_middle_column_4>
161		newsletter
162		</footer_middle_column_4>
163
164		<footer_middle_column_4_custom>
165		porto_footer_links
166		</footer_middle_column_4_custom>
167
168		<footer_middle_column_4_size>
169		3
170		</footer_middle_column_4_size>
171
172		<footer_middle_2>
173		0
174		</footer_middle_2>
175
176		<footer_middle_2_column_1>
177		custom
178		</footer_middle_2_column_1>
179
180		<footer_middle_2_column_1_custom>
181		porto_footer_links
182		</footer_middle_2_column_1_custom>
183
184		<footer_middle_2_column_1_size>
185		3
186		</footer_middle_2_column_1_size>
187
188		<footer_middle_2_column_2>
189		custom
190		</footer_middle_2_column_2>
191
192		<footer_middle_2_column_2_custom>
193		porto_footer_links
194		</footer_middle_2_column_2_custom>
195
196		<footer_middle_2_column_2_size>
197		3
198		</footer_middle_2_column_2_size>
199
200		<footer_middle_2_column_3>
201		custom
202		</footer_middle_2_column_3>
203
204		<footer_middle_2_column_3_custom>
205		porto_footer_links
206		</footer_middle_2_column_3_custom>
207
208		<footer_middle_2_column_3_size>
209		3
210		</footer_middle_2_column_3_size>
211
212		<footer_middle_2_column_4>
213		custom
214		</footer_middle_2_column_4>
215
216		<footer_middle_2_column_4_custom>
217		porto_footer_links
218		</footer_middle_2_column_4_custom>
219
220		<footer_middle_2_column_4_size>
221		3
222		</footer_middle_2_column_4_size>
223
224		<footer_bottom>
225		1
226		</footer_bottom>
227
228		<footer_store_switcher>
229		0
230		</footer_store_switcher>
231
232		<footer_logo_src>
233		default/logo_footer.png
234		</footer_logo_src>
235
236		<footer_bottom_copyrights>
237		<![CDATA[©Copyright 2020 by PORTO. All Rights Reserved.]]>
238		</footer_bottom_copyrights>
239
240		<footer_bottom_custom_1>
241		porto_footer_bottom_custom_block
242		</footer_bottom_custom_1>
243
244		<footer_bottom_custom_2>
245		</footer_bottom_custom_2>
246
247		</footer>
248
249		<category>
250
251		<alternative_image>
252		1
253		</alternative_image>
254
255		<aspect_ratio>
256		0
257		</aspect_ratio>
258
259		<ratio_width>
260		300
261		</ratio_width>
262
263		<ratio_height>
264		400
265		</ratio_height>
266
267		<rating_star>
268		1
269		</rating_star>
270
271		<product_price>
272		1
273		</product_price>
274
275		<actions>
276		1
277		</actions>
278
279		<addtocompare>
280		1
281		</addtocompare>
282
283		<addtowishlist>
284		1
285		</addtowishlist>
286
287		<page_layout>
288		2columns-left
289		</page_layout>
290
291		<category_description>
292		main_column
293		</category_description>
294
295		<side_custom_block>
296		porto_category_side_custom_block
297		</side_custom_block>
298
299		</category>
300
301		<category_grid>
302
303		<product_type>
304		1
305		</product_type>
306
307		<columns>
308		4
309		</columns>
310
311		</category_grid>
312
313		<product>
314
315		<product_image_size>
316		6
317		</product_image_size>
318
319		<side_custom_block>
320		porto_product_side_custom_block
321		</side_custom_block>
322
323		<main_custom_block>
324		</main_custom_block>
325
326		<main_custom_block2>
327		</main_custom_block2>
328
329		<move_addtolinks>
330		0
331		</move_addtolinks>
332
333		<move_upsell_full>
334		0
335		</move_upsell_full>
336
337		<page_layout>
338		2columns-right
339		</page_layout>
340
341		<tab_full_background>
342		0
343		</tab_full_background>
344
345		<custom_block_next_tab>
346		</custom_block_next_tab>
347
348		<upsell_columns>
349		4
350		</upsell_columns>
351
352		<move_upsell>
353		0
354		</move_upsell>
355
356		</product>
357		» »
358		<newsletter>
359		» » »
360		<logo_src>
361		default/logo.png
362		</logo_src>
363		» »
364		</newsletter>
365
366		<contacts>
367
368		<enable>
369		1
370		</enable>
371
372		<full_width>
373		0
374		</full_width>
375
376		<address>
377		Porto2 Store
378		</address>
379
380		<latitude>
381		-34.398
382		</latitude>
383
384		<longitude>
385		150.884
386		</longitude>
387
388		<zoom>
389		18
390		</zoom>
391
392		<infoblock>
393		<![CDATA[<div class="row">
394		<div class="col-md-12">
395		<i class="porto-icon-phone"></i>
396		<p>0201 203 2032</p>
397		<p>0201 203 2032</p>
398		</div>
399		</div>
400		<div class="row">
401		<div class="col-md-12">
402		<i class="porto-icon-mobile"></i>
403		<p>201-123-3922</p>
404		<p>302-123-3928</p>
405		</div>
406		</div>
407		<div class="row">
408		<div class="col-md-12">
409		<i class="porto-icon-mail-alt"></i>
410		<p>porto@gmail.com</p>
411		<p>porto@portotemplate.com</p>
412		</div>
413		</div>
414		<div class="row">
415		<div class="col-md-12">
416		<i class="porto-icon-skype"></i>
417		<p>porto_skype</p>
418		<p>proto_template</p>
419		</div>
420		</div>]]>
421		</infoblock>
422
423		<customblock>
424		</customblock>
425
426		</contacts>
427
428		<custom_settings>
429
430		<custom_style>
431		<![CDATA[.block-category-list {
432		margin-bottom: 15px;
433		}
434		.products-grid .product-item .product-item-info.type3 .weltpixel-quickview.weltpixel_quickview_button_v2 {
435		border-radius: 0 0 5px 5px;
436		font-family: "Open Sans";
437		letter-spacing: 0;
438		}
439		.price-box .price {
440		font-family: "Open Sans";
441		font-weight: 600;
442		}]]>
443		</custom_style>
444
445		<custom_style_2>
446		<![CDATA[]]>
447		</custom_style_2>
448
449		</custom_settings>
450
451		</porto_settings>
452
453		<porto_design>
454
455		<general>
456
457		<theme_color>
458		</theme_color>
459
460		</general>
461
462		<font>
463
464		<custom>
465		0
466		</custom>
467
468		<font_size>
469		</font_size>
470
471		<font_family>
472		</font_family>
473
474		<custom_font_family>
475		</custom_font_family>
476
477		<google_font_family>
478		</google_font_family>
479
480		<char_latin_ext>
481		</char_latin_ext>
482
483		<char_subset>
484		</char_subset>
485
486		</font>
487
488		<colors>
489
490		<custom>
491		0
492		</custom>
493
494		<text_color>
495		</text_color>
496
497		<link_color>
498		</link_color>
499
500		<link_hover_color>
501		</link_hover_color>
502
503		<button_bg_color>
504		</button_bg_color>
505
506		<button_text_color>
507		</button_text_color>
508
509		<button_hover_bg_color>
510		</button_hover_bg_color>
511
512		<button_hover_text_color>
513		</button_hover_text_color>
514
515		<addtowishlist_color>
516		</addtowishlist_color>
517
518		<addtowishlist_hover_color>
519		</addtowishlist_hover_color>
520
521		<addtocompare_color>
522		</addtocompare_color>
523
524		<addtocompare_hover_color>
525		</addtocompare_hover_color>
526
527		<breadcrumbs_bg_color>
528		</breadcrumbs_bg_color>
529
530		<breadcrumbs_color>
531		</breadcrumbs_color>
532
533		<breadcrumbs_links_color>
534		</breadcrumbs_links_color>
535
536		<breadcrumbs_links_hover_color>
537		</breadcrumbs_links_hover_color>
538
539		<sale_bg_color>
540		</sale_bg_color>
541
542		<sale_font_color>
543		</sale_font_color>
544
545		<new_bg_color>
546		</new_bg_color>
547
548		<new_font_color>
549		</new_font_color>
550
551		<price_slider_bg_color>
552		0088CC
553		</price_slider_bg_color>
554
555		<price_slider_handle_color>
556		0088CC
557		</price_slider_handle_color>
558
559		</colors>
560
561		<header>
562
563		<custom>
564		0
565		</custom>
566
567		<header_bgcolor>
568		</header_bgcolor>
569
570		<header_bg_image>
571		</header_bg_image>
572
573		<header_bordercolor>
574		</header_bordercolor>
575
576		<header_textcolor>
577		</header_textcolor>
578
579		<header_linkcolor>
580		</header_linkcolor>
581
582		<header_top_links_bgcolor>
583		</header_top_links_bgcolor>
584
585		<header_top_links_color>
586		</header_top_links_color>
587
588		<header_menu_bgcolor>
589		</header_menu_bgcolor>
590
591		<header_menu_color>
592		</header_menu_color>
593
594		<header_menu_hover_bgcolor>
595		</header_menu_hover_bgcolor>
596
597		<header_menu_hover_color>
598		</header_menu_hover_color>
599
600		<header_menu_classicmenu_bgcolor>
601		</header_menu_classicmenu_bgcolor>
602
603		<header_menu_classicmenu_bordercolor>
604		</header_menu_classicmenu_bordercolor>
605
606		<header_menu_classicmenu_color>
607		</header_menu_classicmenu_color>
608
609		<header_menu_classicmenu_hover_bgcolor>
610		</header_menu_classicmenu_hover_bgcolor>
611
612		<header_menu_classicmenu_hover_color>
613		</header_menu_classicmenu_hover_color>
614
615		<header_search_bgcolor>
616		</header_search_bgcolor>
617
618		<header_search_text_color>
619		</header_search_text_color>
620
621		<header_search_bordercolor>
622		</header_search_bordercolor>
623
624		<header_minicart_bgcolor>
625		</header_minicart_bgcolor>
626
627		<header_minicart_color>
628		</header_minicart_color>
629
630		<header_minicart_icon_color>
631		</header_minicart_icon_color>
632
633		</header>
634
635		<footer>
636
637		<custom>
638		0
639		</custom>
640
641		<footer_top_bgcolor>
642		</footer_top_bgcolor>
643
644		<footer_top_color>
645		</footer_top_color>
646
647		<footer_top_link_color>
648		</footer_top_link_color>
649
650		<footer_top_link_hover_color>
651		</footer_top_link_hover_color>
652
653		<footer_middle_bgcolor>
654		</footer_middle_bgcolor>
655
656		<footer_middle_color>
657		</footer_middle_color>
658
659		<footer_middle_link_color>
660		</footer_middle_link_color>
661
662		<footer_middle_link_hover_color>
663		</footer_middle_link_hover_color>
664
665		<footer_middle_title_color>
666		</footer_middle_title_color>
667
668		<footer_middle_links_icon_color>
669		</footer_middle_links_icon_color>
670
671		<footer_middle_ribbon_bgcolor>
672		</footer_middle_ribbon_bgcolor>
673
674		<footer_middle_ribbon_shadow_color>
675		</footer_middle_ribbon_shadow_color>
676
677		<footer_middle_ribbon_color>
678		</footer_middle_ribbon_color>
679
680		<footer_middle_2_bgcolor>
681		</footer_middle_2_bgcolor>
682
683		<footer_middle_2_color>
684		</footer_middle_2_color>
685
686		<footer_middle_2_link_color>
687		</footer_middle_2_link_color>
688
689		<footer_middle_2_link_hover_color>
690		</footer_middle_2_link_hover_color>
691
692		<footer_middle_2_title_color>
693		</footer_middle_2_title_color>
694
695		<footer_middle_2_links_icon_color>
696		</footer_middle_2_links_icon_color>
697
698		<footer_bottom_bgcolor>
699		</footer_bottom_bgcolor>
700
701		<footer_bottom_color>
702		</footer_bottom_color>
703
704		<footer_bottom_link_color>
705		</footer_bottom_link_color>
706
707		<footer_bottom_link_hover_color>
708		</footer_bottom_link_hover_color>
709
710		</footer>
711
712		<page>
713
714		<custom>
715		0
716		</custom>
717
718		<page_bgcolor>
719		</page_bgcolor>
720
721		<page_bg_image>
722		</page_bg_image>
723
724		<page_custom_style>
725		<![CDATA[]]>
726		</page_custom_style>
727
728		</page>
729
730		<main>
731
732		<custom>
733		0
734		</custom>
735
736		<main_bgcolor>
737		</main_bgcolor>
738
739		<main_bg_image>
740		</main_bg_image>
741
742		<main_custom_style>
743		<![CDATA[]]>
744		</main_custom_style>
745
746		</main>
747
748		</porto_design>
749
750		<mpsearch>
751
752		<general>
753
754		<enabled>
755		1
756		</enabled>
757
758		</general>
759
760		</mpsearch>
761		</config>
762		</root>